From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 27 Nov 2014 14:24:49 +0000 (+0000)
Subject: main: Fix unsetting of custom stylesheets
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1955
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ed7649c93ad3d05d844838d4c8e4a2c0f33fa613;p=gnome-shell.git

main: Fix unsetting of custom stylesheets

Since moving to a GFile based API in commit 642bf2b7782819,
setThemeStylesheet() no longer accepts %null to revert to
the default theme. We should have some way to revert to the
default and the least intrusive option is to return to the
old behavior, so do that.
---

diff --git a/js/ui/main.js b/js/ui/main.js
index 9467d564b..36d759169 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -271,7 +271,7 @@ function getThemeStylesheet() {
  * Set the theme CSS file that the shell will load
  */
 function setThemeStylesheet(cssStylesheet) {
-    _cssStylesheet = Gio.File.new_for_path(cssStylesheet);
+    _cssStylesheet = cssStylesheet ? Gio.File.new_for_path(cssStylesheet) : null;
 }
 
 /**